From b77e35477f2176cef15af7673316f31c633aa833 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 22 Nov 2006 09:51:20 +0000 Subject: [PATCH] [XENOPROFILE] Update xenoprof linux side patch following Renato's comment. - compilation fix when CONFIG_OPROFILE=m with minor clean up - don't export xenoprof_is_primary. Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c | 2 +- .../include/asm-i386/mach-xen/asm/xenoprof.h | 4 ++-- linux-2.6-xen-sparse/include/xen/xenoprof.h | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c index 2dd29eddc7..382a50f647 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c @@ -48,7 +48,7 @@ static int xenoprof_start(void); static void xenoprof_stop(void); static int xenoprof_enabled = 0; -int xenoprof_is_primary = 0; +static int xenoprof_is_primary = 0; static int active_defined; /* Number of buffers in shared area (one per VCPU) */ diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h index fa43d62aef..2733e00ee4 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h @@ -21,7 +21,7 @@ */ #ifndef __ASM_XENOPROF_H__ #define __ASM_XENOPROF_H__ -#ifdef CONFIG_OPROFILE +#ifdef CONFIG_XEN struct super_block; struct dentry; @@ -44,5 +44,5 @@ int xenoprof_arch_map_shared_buffer(struct xenoprof_get_buffer* get_buffer, stru struct xenoprof_passive; int xenoprof_arch_set_passive(struct xenoprof_passive* pdomain, struct xenoprof_shared_buffer* sbuf); -#endif /* CONFIG_OPROFILE */ +#endif /* CONFIG_XEN */ #endif /* __ASM_XENOPROF_H__ */ diff --git a/linux-2.6-xen-sparse/include/xen/xenoprof.h b/linux-2.6-xen-sparse/include/xen/xenoprof.h index 54892b9597..4c3ab0fb21 100644 --- a/linux-2.6-xen-sparse/include/xen/xenoprof.h +++ b/linux-2.6-xen-sparse/include/xen/xenoprof.h @@ -22,24 +22,21 @@ #ifndef __XEN_XENOPROF_H__ #define __XEN_XENOPROF_H__ +#ifdef CONFIG_XEN -#ifdef CONFIG_OPROFILE #include struct oprofile_operations; int xenoprofile_init(struct oprofile_operations * ops); void xenoprofile_exit(void); -extern int xenoprof_is_primary; -#define is_xenoprof_primary() (xenoprof_is_primary) struct xenoprof_shared_buffer { char *buffer; struct xenoprof_arch_shared_buffer arch; }; #else -#define xenoprofile_init(ops) do { } while (0) +#define xenoprofile_init(ops) (-ENOSYS) #define xenoprofile_exit() do { } while (0) -#define is_xenoprof_primary() (0) -#endif /* CONFIG_OPROFILE */ +#endif /* CONFIG_XEN */ #endif /* __XEN_XENOPROF_H__ */ -- 2.30.2